From 98eac8ac830d6c98d3cb187831555b007aaa932b Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 13 Feb 2023 01:08:53 +0100 Subject: [PATCH] Fixes for gdk_memory_texture_new_subtexture checks There were several mistakes here. --- gdk/gdkmemorytexture.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gdk/gdkmemorytexture.c b/gdk/gdkmemorytexture.c index 641386b786..85d9ba0a25 100644 --- a/gdk/gdkmemorytexture.c +++ b/gdk/gdkmemorytexture.c @@ -178,10 +178,10 @@ gdk_memory_texture_new_subtexture (GdkMemoryTexture *source, GBytes *bytes; g_return_val_if_fail (GDK_IS_MEMORY_TEXTURE (source), NULL); - g_return_val_if_fail (x >= 0 || x < GDK_TEXTURE (source)->width, NULL); - g_return_val_if_fail (y >= 0 || y < GDK_TEXTURE (source)->height, NULL); - g_return_val_if_fail (width > 0 || x + width <= GDK_TEXTURE (source)->width, NULL); - g_return_val_if_fail (height > 0 || y + height <= GDK_TEXTURE (source)->height, NULL); + g_return_val_if_fail (x >= 0 && x < GDK_TEXTURE (source)->width, NULL); + g_return_val_if_fail (y >= 0 && y < GDK_TEXTURE (source)->height, NULL); + g_return_val_if_fail (width > 0 && x + width <= GDK_TEXTURE (source)->width, NULL); + g_return_val_if_fail (height > 0 && y + height <= GDK_TEXTURE (source)->height, NULL); texture = GDK_TEXTURE (source); bpp = gdk_memory_format_bytes_per_pixel (texture->format); -- 2.30.2